Timeline for Git: Best practices for using updates from one branch in another
Current License: CC BY-SA 4.0
14 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Mar 5, 2022 at 0:00 | history | tweeted | twitter.com/StackSoftEng/status/1499897557769719808 | ||
| Mar 4, 2022 at 16:29 | answer | added | TTT | timeline score: 2 | |
| Mar 4, 2022 at 13:24 | answer | added | Greg Burghardt | timeline score: 1 | |
| Mar 4, 2022 at 9:06 | answer | added | pjc50 | timeline score: 0 | |
| Mar 3, 2022 at 21:17 | answer | added | Jon Raynor | timeline score: 4 | |
| Mar 3, 2022 at 21:12 | history | edited | Shaun Mitchell | CC BY-SA 4.0 |
deleted 5 characters in body
|
| Mar 3, 2022 at 21:04 | comment | added | Greg Burghardt | Ok, so FooBar.groovy is a file in the git repository. Now I understand. I wasn't sure if this "lib" was something outside the repository. That makes a big difference. | |
| Mar 3, 2022 at 20:54 | comment | added | Shaun Mitchell |
@Robert I'd read that rebase might be a good solution if the branches in question aren't shared branches (and they're not). If I understand correctly, that'd look like: git checkout test-branch && git rebase development?
|
|
| Mar 3, 2022 at 20:50 | comment | added | Shaun Mitchell |
@GregBurghardt updated the post with FooBar for the branch name and FooBar.groovy for the lib name where appropriate
|
|
| Mar 3, 2022 at 20:48 | history | edited | Shaun Mitchell | CC BY-SA 4.0 |
added 50 characters in body
|
| Mar 3, 2022 at 19:51 | comment | added | Robert | If their branches are just local branches (not yet pushed somewhere) it would make sense to include the changes from dev branch by git rebase. Git allows to fetch changes of a branch not checked out like dev branch and then rebase you branch based on the updated dev branch. | |
| Mar 3, 2022 at 19:33 | comment | added | Greg Burghardt | You say there is a "lib" branch... but also a lib... can you clarify what you mean? Do you have a branch named "lib" for the common stuff, but also a library (e.g. a DLL or jar)? | |
| S Mar 3, 2022 at 18:42 | review | First questions | |||
| Mar 4, 2022 at 7:05 | |||||
| S Mar 3, 2022 at 18:42 | history | asked | Shaun Mitchell | CC BY-SA 4.0 |