Timeline for Version control for modification of a part of another project used in my project
Current License: CC BY-SA 4.0
9 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Jul 8, 2022 at 1:31 | vote | accept | user417469 | ||
| Jul 5, 2022 at 17:16 | answer | added | amon | timeline score: 0 | |
| Jul 5, 2022 at 13:57 | answer | added | Greg Burghardt | timeline score: 1 | |
| Jul 5, 2022 at 13:02 | comment | added | Ewan | seems liek you could cherry pick from A using --allow-unrelated-histories ? | |
| Jul 5, 2022 at 12:22 | comment | added | Thomas Owens♦ |
Without understanding exactly what foo.h is, it seems like once you remove the rest of A and make changes to foo.h and both A and B evolve, it seems unlikely that the effort to keep foo.h up-to-date with changes in A, especially in an automated manner, makes sense. Why can't you just subscribe to updates in A and manually apply improvements that are applicable and otherwise let them evolve in two separate directions? Eventually, I suspect you'll be able to stop following A because they have diverged too much.
|
|
| Jul 5, 2022 at 11:01 | comment | added | user417469 | It will need to be merged manually, to ensure that the changes are compatible with my project. Using diff is possible, but that way, I lose the comfort that is possible with keeping track of changes that are common in both. There will be no 3-way merge, for example. | |
| Jul 5, 2022 at 10:03 | comment | added | Pieter B | Is this a task that needs automation or would it be enough to manually check if there's changes in foo.h from time to time and use a diff tool to pickup the changes you want? | |
| S Jul 5, 2022 at 9:46 | review | First questions | |||
| Jul 5, 2022 at 17:22 | |||||
| S Jul 5, 2022 at 9:46 | history | asked | user417469 | CC BY-SA 4.0 |