Hi,
On 09/16/2011 11:11 PM, Miklos Espak wrote:
Hi Sascha,
Thanks, I will do that probably tomorrow. Now I understand why I did
not find the pull request button. :(
I started in the way you wrote, I had a "cim" branch into which I
merged my feature branches, and what I rebased on the origin/master
occasionally. Then I removed it, now I have a master containing the
fork and I just pull the changes from upstream/master into that.
I do not know what is the best strategy. I read several approaches. I
did not see what are benefits of having a separate branch.
So you suggest the first approach but not to rebase it to the
upstream/master but just to pull the changes from that regularly, right?
Yes, that was my suggestion. But since there are so many workflows
possible with git, this is really a matter of taste. One benefit I see
from this approach is that you can easily view the differences from
"your" master branch to the original MITK master by using github's
compare view. Of course, you can always view differences between
branches from any repository using your local git tools.
So I only have to rename all my branches by adding a "cim-" prefix
(e.g. cim-master), recreate the github repo and push them up all, right?
Yeah, although the branch names do not matter, having a "cim-" prefix is
a nice convention :-)
I will have a look at your branches and probably integrate some of your
changes next week. Are there any branches you would especially like to
have integrated?
Best,
Sascha
Thanks,
Miklos
On 2011.09.16. 21:00, "Sascha Zelzer" <[email protected]
<mailto:[email protected]>> wrote:
> Hi Miklos,
>
> Thanks for your efforts, it is appreciated.
>
> I just wanted to have look at your branches via github but realized,
> that your MITK repository is not a proper "github fork" of
> https://github.com/MITK/MITK. While this is not dramatic from a pure
git
> view, it will be impossible to use github's features to compare
branches
> between your fork and the original.
>
> So if you can, please delete your github repo and use the "Fork" button
> at https://github.com/MITK/MITK to recreate it in your account. You can
> then re-push your branches from your local clone to github.
>
> Another small advice would be to not use "master" in your fork to merge
> all your topic branches. If you use a branch called "master-patched"
> (for example) to integrate your topic branches and keep "master"
> up-to-date with the original MITK/master, it will be easier to use
> github's features for examining how your code diverges.
>
> Thanks,
>
> Sascha
>
> On 09/16/2011 08:15 PM, Miklos Espak wrote:
>> Hi,
>>
>> I added two new preferences to the StdMultiWidgetEditor for
>> customizing the display format of pixel values on the status bar.
>>
>> I pushed the changes here:
>>
>>
https://github.com/cim-unito/MITK/tree/bug_7-pixel_value_precision_on_the_status_bar
>>
>> Later, I will use the same preferences also for the label and window
>> fields, and I want to introduce some other improvements as well.
>>
>> I will not report every change I make to your bugzilla, because I am
>> not sure that you really find these fixes or improvements useful, or
>> important, or whether you have time to deal with them. However, I
>> would be happy if you could integrate the additions I make, since it
>> would make it much easier for me to keep my fork as close to the
>> upstream as possible.
>>
>> GitHub provides a "Watch" button using which you can be notified of
>> the changes, or I can send pull requests. These can help to keep the
>> projects synchronized.
>>
>> I will push a branch for every change, the bug number is for our
>> internal bugzilla.
>>
>> Best,
>> Miklos
>>
>>
------------------------------------------------------------------------------
>> BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
>> http://p.sf.net/sfu/rim-devcon-copy2
>> _______________________________________________
>> mitk-users mailing list
>> [email protected]
<mailto:[email protected]>
>> https://lists.sourceforge.net/lists/listinfo/mitk-users
>
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
http://p.sf.net/sfu/rim-devcon-copy2
_______________________________________________
mitk-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mitk-users
