Would you like to know if your branch has conflicts before you go to merge it in? 💥
If so, check out our newest video or continue reading 👀
Would you like to know if your branch has conflicts before you go to merge it in? 💥
If so, check out our newest video or continue reading 👀
1️⃣ To get started, make sure you have the GitLive extension installed.
2️⃣ Now when you open a file from your repository you’ll see the changes from all other branches in the gutter of your editor.
3️⃣ You can roll over the affected lines to see the details of the change, the author and the branch the change is coming from, or even cherry-pick the changes into your version of the file.
4️⃣ And if you make a conflicting change in the same place you’ll get this bright red indicator instantly showing you the conflict!
Share with your friends and followers
Start blogging about your favorite technologies, reach more readers and earn rewards!
Join other developers and claim your FAUN account now!
GitLive
Development teams merge faster with GitLive
User Popularity
74
Influence
7k
Total Hits
5
Posts
Read, Learn, Know, Teach
Hand curated newsletters for Developers, private Slack with like minded people, podcasts, job offers, news and more!
Only registered users can post comments. Please, login or signup.