Ok, you've made changes, and those conflict with jsoftware changes. What I think you should do is put your changes on a different branch. The jsoftware/jsource repository only has one branch, named 'master'. You should make another branch, let's call it 'akakima'
Here's a procedure for doing that: (1) stash your changes: git stash (2) copy the current master branch as a new branch git checkout -b akakima (this creates a new branch and makes it current. Or: git checkout makes a branch current, and the -b option says that that's a new branch which should be a copy of the current one.) (3) get your changes back git stash pop (4) commit your changes to this branch git commit -am 'first draft of changes for 32 bit os' (If you left out the m option, you would be put into a text editor to specify your commit message. The -a option says to commit all modified files.) (5) Now go back to the master branch git checkout master (6) And, only once you are ready for them, get the current changes: git pull Next you'll need to work on incorporating these changes into your branch git checkout akakima git merge master If there are conflicts, you will need to figure out what to do about them. You should also think about including files in your branch which you use which are not modifications of existing files (which is all the above deals with). For that you'll be using git add (and then git commit). You might also want a reference on how git works: https://marklodato.github.io/visual-git-guide/index-en.html Anyways, this should get you started... Or, I hope this helps, -- Raul On Sat, Jun 6, 2020 at 12:20 PM Akakima <[email protected]> wrote: > > > Have you made any changes to your local copy? > > Yes. Some. > > To take in account the fact that i have a 32 bits OS with only 3 gig of > memory. > To allow J to compile under Cygwin. > May be 6 Files. > Plus i added some directories (but no conflicts with existing names). > > > > $ git status > On branch master > Your branch is up to date with 'origin/master'. > > Changes not staged for commit: > (use "git add/rm <file>..." to update what will be committed) > (use "git restore <file>..." to discard changes in working directory) > modified: jsrc/js.h > modified: jsrc/xf.c > modified: makemsvc/install.bat > modified: makemsvc/release.bat > deleted: test/g128x3.ijs > modified: test/g320ipt.ijs > modified: test/gdll.ijs > modified: test/gmbx.ijs > deleted: test/test.htm > > Untracked files: > (use "git add <file>..." to include in what will be committed) > jlibrary/addons/dev/ > jsrc/Trace.out > jsrc/a.out > jsrc/a.tds > jsrc/bcc32c.help > jsrc/jcon > jsrc/jconsole.cygwin.c > jsrc/jconsole.cygwin.c.orig > jsrc/jj.exe > jsrc/xf.cygwin.c > jsrc/xt.s > linux-mint-fail.txt > make.msvc/ > make2linux/ > makemsvc/jbld/ > makemsvc/jconsole/jconsole.res > makemsvc/jconsole/jconsole32.exe > makemsvc/jdll/j32.dll > makemsvc/jdll/j32.exp > makemsvc/jdll/j32.lib > makemsvc/jdll/jdll.res > makemsvc/run.bat > makemsvc/tsdll/tsdll32.dll > makemsvc/tsdll/tsdll32.exp > makemsvc/tsdll/tsdll32.lib > makemsvc2/ > test-20200512-13h09/ > test/crash/ > test/test.html > > no changes added to commit (use "git add" and/or "git commit -a") > > > On 2020-06-06 11:27, Michael Dykman wrote: > > Have you made any changes to your local copy? > > > > What does this give you? > > > > $ git status > > > ---------------------------------------------------------------------- > For information about J forums see http://www.jsoftware.com/forums.htm ---------------------------------------------------------------------- For information about J forums see http://www.jsoftware.com/forums.htm
