What I usually do is first ‘git pull’ and if it performs a merge then I do
‘git rebase origin/master’ to have my local commits stay on top of the
history.
On Tue, 5 Dec 2017 at 7:43 PM Georg Zotti wrote:
> Am 05.12.2017 12:36, schrieb Fabien Chéreau:
> > No problems ;) It takes time to get used t
Am 05.12.2017 12:36, schrieb Fabien Chéreau:
No problems ;) It takes time to get used to it.
One of the important point is to never do git pull (because its like
git fetch, git merge) but rather git pull --rebase (or git fetch, git
rebase)
Ah sorry, that was probably me (for some very small co
No problems ;) It takes time to get used to it.
One of the important point is to never do git pull (because its like git
fetch, git merge) but rather git pull --rebase (or git fetch, git rebase)
Fabien
On Tue, Dec 5, 2017 at 2:36 AM, Alexander Wolf
wrote:
> Hi!
>
> 2017-12-05 1:44 GMT+07:00 Fa
Clique
https://sourceforge.net/projects/stellarium/lists/stellarium-pubdevel/unsubscribe
Sgrìobh Francisco RAMIREZ LOPEZ na leanas 05/12/2017 aig 09:13:
> No vull rebre aquest tipus de correus. Donguim de baixa.
> Gràcies
>
>
> ---
No vull rebre aquest tipus de correus. Donguim de baixa.
Gràcies
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
On Mon, Dec 4, 2017 at 11:16 PM, Georg Zotti
wrote:
> Am 04.12.2017 22:25, schrieb Fabien Chéreau:
>
>> Hi Georg,
>>
>> Here is a simple wiki page about the branches:
>> https://github.com/Stellarium/stellarium/wiki/Branching-Strategy
>>
>> I also created a draft main wiki page:
>> https://github
