So i started becoing with Git, and how to update, my problem is that i have made a few config changes, and minor core add-ons, and im noticing that when i "pull" it gives me conflicts, then i can't seem to merge the conflicts, and resolve it, then next time i "pull" it just gives error, is there a way to pull new data, and keep custom changes?
workaround, makinga patch, then replacing with head, then applying patch
Updating to head
Forum rules
READ NOW: L2j Forums Rules of Conduct
READ NOW: L2j Forums Rules of Conduct
- Zoey76
- L2j Inner Circle
- Posts: 7005
- Joined: Tue Aug 11, 2009 3:36 am
Re: Updating to head
Commit your changes in your local repository.
If you have conflicts resolve them using the Merge Tool, Add to Index and make a Merge commit.
Make a Pull to get new changes.Open the Git Repositories view and navigate to the local branch
Open the context menu and select Configure Branch...
In the resulting dialog, select the Rebase checkbox
If you have conflicts resolve them using the Merge Tool, Add to Index and make a Merge commit.
Powered by Eclipse 4.30 | Eclipse Temurin 21 | MariaDB 11.3.2 | L2J Server 2.6.3.0 - High Five
Join our Discord!
Join our Discord!