Timeline for How to collaboratively resolve conflicts in Git?
Current License: CC BY-SA 4.0
16 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Mar 17, 2023 at 0:39 | comment | added | Greg Burghardt | This might not be ideal, but what about using Zoom, Microsoft Teams or their ilk so one person shares their screen while the others look? Get on a phone call (which might not do much good if you all don't speak the same language). You don't need to physically be in the same room anymore to meet. | |
| Mar 16, 2023 at 10:48 | answer | added | Ewan | timeline score: 3 | |
| Mar 16, 2023 at 9:56 | answer | added | Laiv | timeline score: 4 | |
| Mar 15, 2023 at 22:10 | history | became hot network question | |||
| Mar 15, 2023 at 18:47 | comment | added | Greg Burghardt | Ok, everyone telling this person "you screwed up" is not helping. Branching for a larger feature is not some alien concept that we haven't dealt with before. Since time machines do not exist, let's focus on how this person can move forward. | |
| Mar 15, 2023 at 18:06 | answer | added | gnasher729 | timeline score: 4 | |
| Mar 15, 2023 at 17:27 | comment | added | Euphoric | Anyway you solve it, let this be life leson on using Git Flow. Everyone worth their salt is telling you to use trunk-based development. Why do you think you know better? "because we don't know how to make it any smaller" stop with the useless excuses. | |
| Mar 15, 2023 at 17:22 | comment | added | Ewan | rebase is just merge with more potential to screw up | |
| Mar 15, 2023 at 17:09 | answer | added | J_H | timeline score: 4 | |
| Mar 15, 2023 at 17:03 | comment | added | pjc50 | This sort of thing is why I prefer rebase rather than merge flows. | |
| Mar 15, 2023 at 16:45 | comment | added | Ewan | so if the branch you merged to your branch is merged to dev, the conflicts should disappear? | |
| Mar 15, 2023 at 16:41 | comment | added | Michal Krasny | @Ewan I haven't. A colleague of mine has merged a a different branch to his one, then I've merged his one to mine, while the other colleagues branch has been merged to develop. | |
| Mar 15, 2023 at 14:34 | comment | added | Ewan | if there is a conflict then you must have changed the files... so you must know what they are doing? | |
| Mar 15, 2023 at 14:34 | review | Close votes | |||
| Mar 22, 2023 at 3:08 | |||||
| Mar 15, 2023 at 14:19 | history | edited | Michal Krasny | CC BY-SA 4.0 |
added 3 characters in body
|
| Mar 15, 2023 at 14:09 | history | asked | Michal Krasny | CC BY-SA 4.0 |