Timeline for How to collaboratively resolve conflicts in Git?
Current License: CC BY-SA 4.0
4 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Mar 17, 2023 at 15:26 | comment | added | Laiv | Besides tools, I wanted to stress the idea of programming as a team activity. We don't programme isolated and decontextualized chunks of code that someone else will glue and assemble. Programmers working on the same code base are working on the same goal and purpose, just happens they do it from different angles. | |
| Mar 17, 2023 at 12:27 | comment | added | Greg Burghardt | "Fortunately, we have a lot of real-time collaborative tools to perform pair programming or peer review." -- this is the answer here. You cannot collaborate without collaborating. The OP needs the help of the other developers. They all need the proper tools to collaborate. Plain and simple. | |
| Mar 16, 2023 at 10:02 | history | edited | Laiv | CC BY-SA 4.0 |
added 199 characters in body
|
| Mar 16, 2023 at 9:56 | history | answered | Laiv | CC BY-SA 4.0 |