L2J Server

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

Commit your changes in your local repository.

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

Make a Pull to get new changes.

If you have conflicts resolve them using the Merge Tool, Add to Index and make a Merge commit.