Noctis Posted June 17, 2017 Group: Members Topic Count: 47 Topics Per Day: 0.01 Content Count: 226 Reputation: 13 Joined: 02/17/15 Last Seen: August 2, 2017 Share Posted June 17, 2017 (edited) How to solve those conflicts? first I stashed then I pull and appear some conflicts. I did this with achievements without any conflict Edited June 17, 2017 by Noctis Quote Link to comment Share on other sites More sharing options...
0 Ninja Posted June 18, 2017 Group: Members Topic Count: 54 Topics Per Day: 0.01 Content Count: 513 Reputation: 83 Joined: 08/11/12 Last Seen: December 25, 2021 Share Posted June 18, 2017 we have the same issue for rodex + achievement. we will just have to wait for it to be merged with the latest rA commit and I think it'll work just fine. 1 Quote Link to comment Share on other sites More sharing options...
0 Noctis Posted June 18, 2017 Group: Members Topic Count: 47 Topics Per Day: 0.01 Content Count: 226 Reputation: 13 Joined: 02/17/15 Last Seen: August 2, 2017 Author Share Posted June 18, 2017 (edited) 2 minutes ago, Ninja said: we have the same issue for rodex + achievement. we will just have to wait for it to be merged with the latest rA commit and I think it'll work just fine. I thought it was only for me ty xD, Do we have any date when rodex will be merge? Edited June 18, 2017 by Noctis Quote Link to comment Share on other sites More sharing options...
0 Ninja Posted June 18, 2017 Group: Members Topic Count: 54 Topics Per Day: 0.01 Content Count: 513 Reputation: 83 Joined: 08/11/12 Last Seen: December 25, 2021 Share Posted June 18, 2017 1 minute ago, Noctis said: I thought it was only for me ty xD, Do we have any date when rodex will be merge? I don't know. I think it will be for @Lemongrass to say Quote Link to comment Share on other sites More sharing options...
0 Noctis Posted June 18, 2017 Group: Members Topic Count: 47 Topics Per Day: 0.01 Content Count: 226 Reputation: 13 Joined: 02/17/15 Last Seen: August 2, 2017 Author Share Posted June 18, 2017 Just now, Ninja said: I don't know. I think it will be for @Lemongrass to say Oh I see, thanks Quote Link to comment Share on other sites More sharing options...
0 Mikegyver Posted June 18, 2017 Group: Members Topic Count: 4 Topics Per Day: 0.00 Content Count: 399 Reputation: 69 Joined: 12/26/15 Last Seen: December 24, 2022 Share Posted June 18, 2017 11 hours ago, Noctis said: How to solve those conflicts? first I stashed then I pull and appear some conflicts. I did this with achievements without any conflict If in linux, it is quite easy to resolve the conflict.. upon merging, the file which got conflict, will having both older & newer. Just resolve the conflict & execute git add (file_name). Quote Link to comment Share on other sites More sharing options...
0 Noctis Posted June 18, 2017 Group: Members Topic Count: 47 Topics Per Day: 0.01 Content Count: 226 Reputation: 13 Joined: 02/17/15 Last Seen: August 2, 2017 Author Share Posted June 18, 2017 4 hours ago, hazimjauhari90 said: If in linux, it is quite easy to resolve the conflict.. upon merging, the file which got conflict, will having both older & newer. Just resolve the conflict & execute git add (file_name). Im in Windows Quote Link to comment Share on other sites More sharing options...
Question
Noctis
How to solve those conflicts? first I stashed then I pull and appear some conflicts. I did this with achievements without any conflict
Edited by NoctisLink to comment
Share on other sites
6 answers to this question
Recommended Posts
Join the conversation
You can post now and register later. If you have an account, sign in now to post with your account.