search

mariusz-buk / effectus

Effectus by Boštjan Gorisek
Other
9 stars 4 forks source link

Changes made by zbyti (for version 0.5.1) #18

Closed Gury8 closed 4 years ago

mariusz-buk commented 4 years ago

I notice the code conflict when you pushed the changes. It is a good practice to fetch changes before pushing new changes.

So the order should be: commit your changes, pull the changes to solve any conflicts, commit new changes if necessary, push all changes.

Best

Mariusz

Gury8 commented 4 years ago

Ok, thank you for the notice! I will do my best to resolve changes properly next time. I am still new to GitHub and it seems confusing to me sometimes, but I am learning fast and I will make myself more comfortable with it naturally.