resolve conflicts "automatically"

Andrew-Colman

--reset (reset the fork to be identical to current remote )

FarazzShaikh

I'll give this a shot. Also what do you mean by --force? Also do you mean to reset all changes with --reset?

Andrew-Colman

> I'll give this a shot. Also what do you mean by --force? Apply both changes (local files and remote files) (but not recommended) ```js ============current const js = true; ================= const js = false; =============master ``` ```js const js = true; const js = false; ``` maybe something from https://git-scm.com/docs/git-rebase ? <hr> > Also do you mean to reset all changes with --reset? like the project was just forked and cloned, basically reset maybe this command https://git-scm.com/docs/git-reset `git reset --hard <upstream>`

FarazzShaikh

> Apply both changes (local files and remote files) (but not recommended) Won't this cause a ton of errors? I'll get started with -upcoming and -local, it'll just be the -theirs and -ours options in `git merge -X [theirs/ours] <branch>`. And of course -reset

Andrew-Colman

>Won't this cause a ton of errors? yeah, It's not a good idea, >I'll get started with -upcoming and -local, it'll just be the -theirs and -ours options in git merge -X [theirs/ours] <branch>. And of course -reset for the simplicity and purpose of the package this will work

FarazzShaikh

Closed by #16