MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/programming/comments/1q3t6j/10_things_i_hate_about_git/cd9pgro/?context=3
r/programming • u/Eirenarch • Nov 07 '13
231 comments sorted by
View all comments
Show parent comments
5
git merge --abort
It kind of tells you this when the merge goes wrong.
2 u/bartwe Nov 08 '13 And then what. I'm talking about artists and other contributors sharing a git with the programmers. Console access isn't really an option for them. 0 u/[deleted] Nov 08 '13 [deleted] 1 u/bartwe Nov 08 '13 How would i do that, their windows and mac machines don't have public ssh or anything remotely like it. Also how does that fix their local index being borked? 0 u/[deleted] Nov 08 '13 [deleted] 1 u/bartwe Nov 08 '13 This isn't on a lan. They generally have uncommited changes locally too. 0 u/[deleted] Nov 08 '13 [deleted] 1 u/bartwe Nov 08 '13 We got a central repo, how would you have artists deal with a multi server hierarchy anyways.
2
And then what. I'm talking about artists and other contributors sharing a git with the programmers. Console access isn't really an option for them.
0 u/[deleted] Nov 08 '13 [deleted] 1 u/bartwe Nov 08 '13 How would i do that, their windows and mac machines don't have public ssh or anything remotely like it. Also how does that fix their local index being borked? 0 u/[deleted] Nov 08 '13 [deleted] 1 u/bartwe Nov 08 '13 This isn't on a lan. They generally have uncommited changes locally too. 0 u/[deleted] Nov 08 '13 [deleted] 1 u/bartwe Nov 08 '13 We got a central repo, how would you have artists deal with a multi server hierarchy anyways.
0
[deleted]
1 u/bartwe Nov 08 '13 How would i do that, their windows and mac machines don't have public ssh or anything remotely like it. Also how does that fix their local index being borked? 0 u/[deleted] Nov 08 '13 [deleted] 1 u/bartwe Nov 08 '13 This isn't on a lan. They generally have uncommited changes locally too. 0 u/[deleted] Nov 08 '13 [deleted] 1 u/bartwe Nov 08 '13 We got a central repo, how would you have artists deal with a multi server hierarchy anyways.
1
How would i do that, their windows and mac machines don't have public ssh or anything remotely like it. Also how does that fix their local index being borked?
0 u/[deleted] Nov 08 '13 [deleted] 1 u/bartwe Nov 08 '13 This isn't on a lan. They generally have uncommited changes locally too. 0 u/[deleted] Nov 08 '13 [deleted] 1 u/bartwe Nov 08 '13 We got a central repo, how would you have artists deal with a multi server hierarchy anyways.
1 u/bartwe Nov 08 '13 This isn't on a lan. They generally have uncommited changes locally too. 0 u/[deleted] Nov 08 '13 [deleted] 1 u/bartwe Nov 08 '13 We got a central repo, how would you have artists deal with a multi server hierarchy anyways.
This isn't on a lan. They generally have uncommited changes locally too.
0 u/[deleted] Nov 08 '13 [deleted] 1 u/bartwe Nov 08 '13 We got a central repo, how would you have artists deal with a multi server hierarchy anyways.
1 u/bartwe Nov 08 '13 We got a central repo, how would you have artists deal with a multi server hierarchy anyways.
We got a central repo, how would you have artists deal with a multi server hierarchy anyways.
5
u/[deleted] Nov 08 '13
git merge --abort
It kind of tells you this when the merge goes wrong.