git - Bitbucket CRLF issue? -

-

issue: bitbucket shows entire file has changed though dont see differences. , there no merge conflicts in these files.

details: created sprint branch (named "sprintbranch") , developers created feature branch(named "featurebranchx") sprint branch. started merging feature branches sprint branch , when features implemented. there 2 scenarios face issue:

  1. developer creates pull request merge featurebranch1 sprintbranch
  2. if there merge conflicts, developer merges sprintbranch featurebranch1 , creates pull request merge featurebranch1 sprintbranch.

both times bitbucket shows entire file has changed. , there no merge conflicts.

when happens, cannot code review since dont know specific lines have been modified developer. lose history @ point - looking wont able figure out implemented or merged sprint branch.

my guess issue line endings. crlf. when commit work see appropriate line endings being used automatically (either git or tool smartgit)

how resolve doesnt keep happening?

update:

i found out can append query string w=1 @ end of url of pull request ignore cr lf differences.

but these files still there in commit , when merge back, include differences right?

even though bitbucket can ignore whitespace in diffs (using w=1 query parameter), changes still included in merge.

but can configure git convert line endings either lf or crlf. team should first decide option be, , set text property in .gitattributes file accordingly, so:

* text eol=lf

this github page shows more information. (the information git in general, not github.)

you need global configuration option git config --global core.autocrlf input (mac & linux) or git config --global core.autocrlf true (windows).

# make sure won't loose work in progress $ git add . -u $ git commit -m "saving files before refreshing line endings"  # remove every file git index $ git rm --cached -r .  # rewrite git index $ git reset --hard  # prepare changed files commit $ git add . # safe see lot of messages here read # "warning: crlf replaced lf in file."  # , commit. $ git commit -m "normalize line endings"

more information available in github article.


Comments

Post a Comment

Popular posts from this blog

java - nested exception is org.hibernate.exception.SQLGrammarException: could not extract ResultSet Hibernate+SpringMVC -

-
i trying fetch records database , having above error this classs appropriate getters , setters public class user { private int id; private string username; private string password; private string email; i have create database , inserted data below configuration <bean id="datasource" class="org.apache.commons.dbcp2.basicdatasource" destroy-method="close"> <property name="driverclassname" value="com.mysql.jdbc.driver"/> <property name="url" value="jdbc:mysql://localhost:3306/usersdb"/> <property name="username" value="root"/> <property name="password" value=""/> </bean> this complete stacktrace severe: servlet.service() servlet [appservlet] in context path [/spring] threw exception [request processing failed; nested exception org.hibernate.exception.sqlgrammarexception: not ...
Read more

sql - Postgresql tables exists, but getting "relation does not exist" when querying -

-
Image
i have postgresql db number of tables. if query: select column_name information_schema.columns table_name="my_table"; i list of columns returned properly. however, when query: select * "my_table"; i error: (programmingerror) relation "my_table" not exist 'select *\n "my_table"\n' {} any thoughts on why can columns, can't query table? goal able query table. you have include schema if isnt public one select * <schema>."my_table" or can change default schema show search_path; set search_path my_schema; check table schema here select * information_schema.columns for example if table on default schema public both works ok select * parroquias_region select * public.parroquias_region but sectors need specify schema select * map_update.sectores_point
Read more

asp.net mvc - breakpoint on javascript in CSHTML? -

-
i have .cshtml file has javascript tag. within script tag have few lines of javascript. first line of javascript refers property in @viewbag. other javascript lines plain script without mvc related references. observation: can place breakpoints (visual studio 2015) on each of these javascript lines. however, breakpoints has white dot in center of breakpoint symbol (red circle) except line @viewbag reference (this particular line not have white dot in center). it seems breakpoint without white dot hit during run-time. question: can explain going on here? white dot mean? why plain red breakpoint line line hitting breakpoint? the visual studio debugger expecting debug actual server-side code within .cshtml file opposed client-side javascript within it. iirc, visual studio allow debug javascript code expected in internet explorer (and possibly edge), other browsers want use either third-party tool or developer tools (f12) within browser. an easy approach take advant...
Read more