Accepted the new request. Nothing happened. Clicked merge, then it merged
Perfect. Thanks.
As for development: up to now I've developed in the same repo (fpcup; no fork) with 2 persons. Hardly any merge conflicts... if you don't muck around at the same time of course.
The people have commit access to your repo? Ok, then is works smoothly as well.
However the pull request system appears to be very handy, too, and does not require tweaking with commit rights.
BTW: does the program work for you on Linux now?
Unfortunately not. I try to apply patch from here:
http://bugs.freepascal.org/view.php?id=24630Apparently -p0 param is missing.
Original file ending is: Unix (LF).
Original file ending is: Unix (LF).
User switched root directory to /home/juha/SW/lazarus_gitsvn
User initiated dry run
Going to run: sh "-c" "/usr/bin/patch -b -d /home/juha/SW/lazarus_gitsvn --remove-empty-files --verbose --dry-run < /tmp/TMP00003.tmp"
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: heaptrc_settings.inc
|===================================================================
|--- heaptrc_settings.inc (revision 0)
|+++ heaptrc_settings.inc (working copy)
--------------------------
Patching file heaptrc_settings.inc using Plan A...
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
can't find file to patch at input line 13
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|Index: raw_window.pas
|===================================================================
|--- raw_window.pas (revision 41761)
|+++ raw_window.pas (working copy)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
Hunk #1 ignored at 27.
Hunk #2 ignored at 42.
2 out of 2 hunks ignored
Hmm... The next patch looks like a unified diff to me...
can't find file to patch at input line 39
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|Index: redirect_stderr.pas
|===================================================================
|--- redirect_stderr.pas (revision 41761)
|+++ redirect_stderr.pas (working copy)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
Hunk #1 ignored at 27.
Hunk #2 ignored at 43.
2 out of 2 hunks ignored
done
Patch run gave result code 1