git - Sourcetree changes commits when merging -


i'm using sourcetree manage git. i'm trying merge branch changes (master-k) master. looks fine in each commit on branch, during merge, whole file getting changed.

note: master-k branch came user on mac, , might have used merge pull request. i'm on windows 10 using sourcetree.

here's screenshot of branch commits. note diff shown has individual lines: enter image description here

and here screenshot during merge (has conflicts resolve): enter image description here

you can see above diff everything in style.css.

a couple of things have tried:

  • update git global config ignore eol
  • change little settings drop-down "ignore whitespace" enter image description here

the ignore whitespace problem me in past- making diffs on whole file. once found checkbox, fine. made sure off now, merge still giving me problem.

it looks you've got 2 separate issues going on here

line endings , whitespace

make sure auto whitespace set either input or auto if you're on windows. depending on if want preserve unix-style or use windows-style in working directory. both commit unix-style line endings.

then normalize line endings save headaches in future. documented, won't go here, this guide.

note changing diff style not affect files on disk or way git performs merge, changes way diff tool displays changes. recommend leaving whitespace visible because show making unnecessary changes can cause conflicts later.

dealing artifacts

your style.css file compiled sass code, technically artifact, not code proper.

whether or not include in repo largely depends on workflow , deployment process. in ideal world, you'd compile css during deployment process , not store artifacts in repo. since don't live in ideal world, i'll touch briefly on handling weirdness comes artifacts stored in repo.

when you've got artifact this, resolving merge, if successful, @ least break map data in file. compound if start producing minified versions of css well. fortunately, way deal simple, , resolve conflicts source code, re-compile artifacts , add them commit.

the sequence of actions run this:

git checkout master-k git merge master

resolve code conflicts here

npm run buildcssjob # or similar

test everything

git add style.css git commit git checkout master git merge [--no-ff] master-k

and you're done.


Comments

Post a Comment

Popular posts from this blog

ubuntu - PHP script to find files of certain extensions in a directory, returns populated array when run in browser, but empty array when run from terminal -

i running os ububtu 16.04. ultimate goal able run php script cron job every minute. here php script located @ /var/www/html/tests/test/index.php : <?php $directorypath = $_server['document_root']."/tests/test/data/"; echo "directorypath: $directorypath<br><br>";//check $imagefilepathsarray = glob($directorypath . "*.{png,gif}", glob_brace); echo "<br><br>imagefilepathsarray: "; print_r($imagefilepathsarray);//check ?> when open php script in browser visiting url my-ip-address/tests/test/index.php , get: directorypath: /var/www/html/tests/test/data/ imagefilepathsarray:array( [0] => /var/www/html/tests/test/data/pic.png [1] => /var/www/html/tests/test/data/pic.gif ) before writing cron job in crontab file, need check if can run anywhere using terminal . opened ubuntu terminal @ /home/ location, , executed in terminal: sudo php /var/www/html/tests/test/index.php i got following out...
Read more

php - How can i create a user dashboard -

today have questions you, want create user dashboard site, include (obviously), users data, example -email -username -and others stuff how can information, , print them in html page? if can, how can these information via php sessions? shuld use session? example, if user login, , start new session ( session_start() ), how can data print in dashboard? should use php "project"? in advice, have day , thank time!
Read more

javascript - How to detect toggling of the fullscreen-toolbar in jQuery Mobile? -

i have jquery mobile page fixed full-screen toolbar, data-tap-toggle enabled. straight under toolbar have positioned banner should slide upwards when toolbar hiding , slide downward when toolbar showing. jquery mobile toggles toolbar applying , removing ui-fixed-hidden class - sadly, can't find in documentation of toolbar widget toggle , hide or show event that. how can detect when toolbar toggled, reposition banner? .banner { position: fixed; background-color: darkseagreen; top: 46px; min-height: 48px; width: 100%; text-align: center; line-height: 48px; } <!doctype html> <html> <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"> <link rel="stylesheet" href="https://code.jquery.com/mobile/1.4.5/jquery.mobile-1.4.5.css"> <script src="https://code.jquery.com/jquery-1....
Read more